Revert 3d404db..325961e

This rolls back to commit 3d404dbb10642a227c8b9f1c6628dcf92a397663.