Revert ed1c22f..2bf3a8e

This rolls back to commit ed1c22fbee361e01dbd22c6c4b05a2fa421c0ce1.