Revert 03b6494..3775254

This rolls back to commit 03b64944f11f4471ef9c557bd5185293b58a830e.