Revert 571f165..4dd7500

This rolls back to commit 571f1651bf2360d8341f8e56fc2c7e4f26b71002.