Revert 411c27f..7af698b

This rolls back to commit 411c27fbb6e10acbb02129fa68e93bc352955310.
1.5 release
1.5 update