Revert 3a65a24..fc2a2c2

This rolls back to commit 3a65a24b9f9872d5353caa5377c1fdda7295bc58.