Revert 2368f4b..db8436f

This rolls back to commit 2368f4bb674f51cac9c62d503efb6d4378b61c0e.