Revert 7e19e13..0913154

This rolls back to commit 7e19e131f0be0b0643b457ffef28b16d21f2c4e7.
Revert 0913154..d9e47f2

This rolls back to commit 0913154706a386bb6095b364315219b656eab86f.