Revert 2387ae3..f7b4918

This rolls back to commit 2387ae30a2695f8b270eaf250e7d7e0e7da9a246.