Revert 420a438..2886878

This rolls back to commit 420a438deabc2772e3bf089634f81d3a68e099c8.