Revert b32b92b..8b92291

This rolls back to commit b32b92b4abe9844f9444818aed2d71237b7435b0.