Revert 3f68b16..0316a43

This rolls back to commit 3f68b1663ca9e1ca533dfd7e2733e510546bf279.