Revert 142e2cf..6dc8aca

This rolls back to commit 142e2cf1d4d50e728209f933d8b9af1456f4e3c9.