Revert 25dd93e..2b5eaf2

This rolls back to commit 25dd93eb993eb266272d626045c1a72af68ee03e.