Revert 01278c5..1bb403a

This rolls back to commit 01278c56db8ece144f11a7b3486b2d033d408f8b.