Revert 040de40..a4bd69a

This rolls back to commit 040de407c01053ecc0819d857b2ff29482dbbbbb.