Revert 3811a9c..ae4be08

This rolls back to commit 3811a9c29c766b9476d4066b8392e0447bc2beba.