Revert 53a5876..2e9d070

This rolls back to commit 53a58767fb7dd77742747ac3a014fae014c6c872.