Revert 589d299..3cc3305

This rolls back to commit 589d2992d44ab067229e22749c3267a3266cc7d4.