Revert ced55c3..4edf879

This rolls back to commit ced55c369fafc5d7d58372b7bf3ebc1b38ac0b34.