Revert fd44b14..f3cb25d

This rolls back to commit fd44b140ee376e0132cf4f1eba58f1877455d3bb.