Revert 5254dd6..5d7521d

This rolls back to commit 5254dd6121a64bc10463ff354654dda00beb4be5.