Revert bb674f6..ed2d965

This rolls back to commit bb674f63eae1e9fde32da93f2bd8469bce465c5e.