.
Revert 960225c..f08d389

This rolls back to commit 960225c6484ba8cb730fa8f9296f4cd2f12b9416.
..
Revert 688e403..ec4a7e0

This rolls back to commit 688e4033f23ef4801a949b51f75a361d3f6c190e.
Add a check to unwrap optional data