Revert 7a8efc2..68fe2d9

This rolls back to commit 7a8efc2453b8e6917c611d742a8c4521e6349e6d.