Revert 0b2a918..6d59f95

This rolls back to commit 0b2a9180335c3a741c06e0fb04659abc096f4bb5.