Revert 0818a5e..d52a011

This rolls back to commit 0818a5ea90431fa2bef8c5feb7140bdbe2bb8fc4.