Revert 4f08da1..92e2db0

This rolls back to commit 4f08da14aa83a65570ec58f1b2877c68722dcf32.