Revert 4faa40e..2d518de

This rolls back to commit 4faa40e24aa8052fd447aa0c227ff089bd648772.
Revert 2d518de..ed76444

This rolls back to commit 2d518de09738945c1ff81d85661219555748bce0.