Revert 15b2723..e3b703c

This rolls back to commit 15b2723f1c93173ef2dd63eb2be13c61e7ba379b.