Revert ba4b161..5fd8b06

This rolls back to commit ba4b161882c27976e5db4072a51d4846499aa618.