Revert 476441b..29db57e

This rolls back to commit 476441b8a55a7fc13eed76d35132c58f01de6bbd.