Revert to b8937262d572ed6c47d2b3ede2c2a08c54f77281