Revert 69e577c..4dfbdf8

This rolls back to commit 69e577cd0732a6fde6201a1c8af31937ed6de719.