Revert c41414c..365d5c6

This rolls back to commit c41414c9832b29181c7256bb4d291919962fbec9.