Revert 96da17b..df6aba0

This rolls back to commit 96da17b1af21dcfede99be2f82bcd78caa7a0f4a.