Revert b00fd2d..53dae2a

This rolls back to commit b00fd2dc560bfe7637e637cc6167d44ff0d46def.