Revert de8e5ee..bbb6c6b

This rolls back to commit de8e5eeed4389d870649009b9900b37fb1ce71b9.