Revert fec1317..452f698

This rolls back to commit fec1317b3841b4b5ffecd3f59f1ae881c370bda2.