Revert 3eecf2c..fded834

This rolls back to commit 3eecf2cb5f55d4f8734a98c705b29bf3b0904210.