Revert 0e469b1..2a761c5

This rolls back to commit 0e469b122a32b03234bc78e8a3f2c2f4a226f813.
v6