Revert 18d93e8..fd9bb7e

This rolls back to commit 18d93e8f8f1d8aa9edaf7eafe38c7c43fde54aa5.