Revert d0e2f17..d99f054

This rolls back to commit d0e2f1771549f5998273197118525cb6359623ca.