Revert 7316699..edb0542

This rolls back to commit 731669956998e9916dc9c6f7101c7bf96d8a92bb.