Revert 12975be..c6e8185

This rolls back to commit 12975be0b37222cc0d1f65c1d5d35b43bca2b99b.