Revert f1f4302..81ed4c6

This rolls back to commit f1f43024d35e7148aca3322fafed6aaeacff6fc6.
Revert 81ed4c6..24c3738

This rolls back to commit 81ed4c679ae04abeb27de6273a63f15a1443982e.