Revert a8501e2..df18c6d

This rolls back to commit a8501e29f4678b796d02cf4dcb1cf03e2d942ea9.