Revert 8122fc2..312432e

This rolls back to commit 8122fc2cb8777058723c8f07f505c414a827edc8.