Revert 7a10242..90cf794

This rolls back to commit 7a10242d52e6d79584e1e88472364dff75dc3c25.