Revert 3a1514c..9cfb8a6

This rolls back to commit 3a1514c50436e30ad5e20267ffef56bdd6bde201.
Revert 9cfb8a6..583fc2e

This rolls back to commit 9cfb8a6e5a2ee94396eddc25c9c5331b46636014.