Revert 95c8a21..d43be75

This rolls back to commit 95c8a2130016031b4329ec5ea01c04079e2a7bce.