Revert 4ba4eb2..e5738ef

This rolls back to commit 4ba4eb230ad0dcf599da910ee88eebdc34be9a95.