Revert efcbcc9..cbf5c9b

This rolls back to commit efcbcc9ffa6900206d3a5b360e7e46704392e6b3.