Revert 460bc29..a2e574f

This rolls back to commit 460bc298359a80ad00345bc76fb8d3723828c85c.