Revert bb5106c..d452f27

This rolls back to commit bb5106ce728bb00a39086f96f7b611ba3bf8cd9c.