Revert 38c8a13..1c6abf3

This rolls back to commit 38c8a13595b2bec502c0fc1c8eb3ac0482066bc2.