Revert f6ec96c..1dc3cd6

This rolls back to commit f6ec96cf4f5e84d5c1581cb3e02bc9914d7bd783.