Revert 3bbbd72..89c1e8f

This rolls back to commit 3bbbd72f1ce0f97bfee8413970800cda8f7bf080.