Revert 3e620c8..129061e

This rolls back to commit 3e620c8708ce536fbaa82085c151e91f33cc411e.