Revert dc7657e..df1d449

This rolls back to commit dc7657e9937c3820c4cba1f7730498e9e9d9eed3.