Revert 4273b4e..a0fd1ad

This rolls back to commit 4273b4eaad4fc4051b384ce5daf190596df1430b.