Revert 323d1ba..1883051

This rolls back to commit 323d1baba65401a153b71c91607734531b06d26c.