Revert 378b72e..591917e

This rolls back to commit 378b72e903f0362c833465397add05aaf35c3d5e.