Revert bfe152a..8ede1aa

This rolls back to commit bfe152a9f56b19029150afb1192792d5608b4a47.