Revert 813556d..093f6df

This rolls back to commit 813556dfd007ff5d31a9cd2b2de8268a4e6be8cc.
Revert f9434a0..9968e21

This rolls back to commit f9434a00d384638c3da715efdbc488462db950ab.
123