Revert 3ee79bc..5dcd255

This rolls back to commit 3ee79bc50b4de7b82181a5cb0b180cabcb3eafad.