Revert 831cd1e..872e4de

This rolls back to commit 831cd1ea1f47743817077be96f71ebc9c6b22c7f.