Revert 7d788ee..cd1e8ed

This rolls back to commit 7d788ee88508673ffb41f181eefa99bf8fd5019b.