Revert 61f1d6c..06a8db1

This rolls back to commit 61f1d6ca55c250b20d8be93939f955d38ae6e088.