Revert 3dcb6f5..72c4e1c

This rolls back to commit 3dcb6f5df906b3c3584c65f747e8e095693c683a.