Revert 4fe8f48..6883e5f

This rolls back to commit 4fe8f485d62a5f576632d92fdd6828b472580fc4.
Revert "Revert 4fe8f48..6883e5f"

This reverts commit f987f0b32a8daf325e3d27e7acbeffcc12b21354.