Revert 3883bc5..b8417de

This rolls back to commit 3883bc5cd94b9934e6ecaf5ce25712ff181e7760.