Revert 016f0de..0a5b5a8

This rolls back to commit 016f0de10f6a7e720a92e4bcc4891c9511f5c024.