Revert 4c9b614..af12814

This rolls back to commit 4c9b614131e7ebcbea3bf9eda99d5e6f4eccb786.