Revert cb8bafe..c515cc6

This rolls back to commit cb8bafedc8369a34f9344c46040ec64523b8cb99.