Revert c844aed..e5344f7

This rolls back to commit c844aedceaa95c1baf8422fa295c250c864f7422.