Revert c6c98a6..5bebce4

This rolls back to commit c6c98a6b799ff34175d2d604f5aec1cdec302791.