Second half of PR1226. This is currently still disabled, until I have a chance to