Revert 297fc64..89a409a

This rolls back to commit 297fc643553b9828cc97317668460ba0628b1626.