Revert 6e5aea2..e552f85

This rolls back to commit 6e5aea2b8790281b51e30a1975702d2bc3de7d97.