Revert c8be500..5a5dcd0

This rolls back to commit c8be500317f67fd35acc49dad9ba63231e5522eb.