Revert 384c03d..9053c98

This rolls back to commit 384c03d227684f29c1be6f33e31d546354b57e96.