Revert 8d04e23..460f2e5

This rolls back to commit 8d04e23a29781f3113dcd13c76f571930608a715.