Revert 515a747..ff87ed2

This rolls back to commit 515a74751f36b45f24dfb86ee16d7f1ca7a413a5.