Revert 08af991..3a3cac2

This rolls back to commit 08af9912d5b3e8f1703751a5f8d2e2c5bbf83edf.