Revert 286b190..5dd8dff

This rolls back to commit 286b190e2ef62ab332d1c57c9eaade422551af70.