Revert 194fb8e..16ee848

This rolls back to commit 194fb8eb772c573a35e84528d0d0e1d5244e3808.