Revert d4d7a4b..0d954db

This rolls back to commit d4d7a4b4c85906fa1c9c980ba06f06bde3363424.