Revert 427b77f..5fe8020

This rolls back to commit 427b77fa06336f8804e0f2f7b1c91526f9a05e62.