Revert 5252666..ea6ca8a

This rolls back to commit 5252666dea1e9a73a9e6b4608cf8e4ed0cb36fb0.