Revert 57d06b4..362d1db

This rolls back to commit 57d06b485d3ab3c20d3cb435ef749b6defb04b06.