Revert 073e1d7..d02399e

This rolls back to commit 073e1d7fefa2d01ccb16384facd40fef491cccbc.