Revert 955c44b..c9dd6c1

This rolls back to commit 955c44b53074c14642863408d735620e96833390.