Revert 2b8abca..fee10ec

This rolls back to commit 2b8abca8d7f9788589feceba7ef1de7f0150975c.