Revert eec768b..4fbb12d

This rolls back to commit eec768b6774641ec683948c9a224eaffc035ddf3.
add back in 559 fix