Revert 8d1ee05..0bad076

This rolls back to commit 8d1ee05369955284cd5e3e13f23c476520f07fc2.