Revert 5e54352..857869b

This rolls back to commit 5e543524c3ecb3c6b57069a2809f4b87085e1e98.
Revert 2bc64f9..aed282c

This rolls back to commit 2bc64f9934c05bc4aa1aa5a72c335deebfc4fcba.