Revert 44da1c8..f8e1014

This rolls back to commit 44da1c8c9fafea6c6233749b53ad58f050c033aa.