Revert 39cd058..244d737

This rolls back to commit 39cd05852e1f2e8360fcad87b9b8b8150f9be6fb.