Revert d90594b..51a4cf2

This rolls back to commit d90594b17924ded470f51d1d7ae9892e661a5e71.